Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 22:03:49 +0000 (15:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 6 Jul 2011 22:03:49 +0000 (15:03 -0700)
commitd390f9cf8deb335314f068dda5572b19a285ffae
tree4ef9978379b324b97aa39487b397978d4d9bd324
parent23d4be02f91dd3268f29e7068af4cc34209ab94b
parent12d79fb3ee1e5280e4da759aa5dba4ead2334686
Merge from trunk.